Merge pull request #122 from philsmd/master