Merge pull request #52 from philsmd/master