Merge pull request #115 from philsmd/master