Merge pull request #144 from chris5560/master