Merge pull request #401 from philsmd/master