Merge pull request #278 from philsmd/master