Merge pull request #58 from philsmd/master