Merge pull request #391 from cmurphy/master