Merge pull request #426 from philsmd/master