Merge pull request #404 from philsmd/master