Merge pull request #413 from philsmd/master