Merge pull request #271 from philsmd/master