Merge pull request #54 from philsmd/master