Merge pull request #276 from philsmd/master