Merge pull request #417 from philsmd/master