Merge pull request #350 from cmurphy/master