Merge pull request #53 from philsmd/master