Merge pull request #259 from philsmd/master