Merge pull request #356 from philsmd/master