Merge pull request #370 from philsmd/master