Merge pull request #228 from philsmd/master