Merge pull request #275 from philsmd/master