Merge pull request #264 from philsmd/master