Merge pull request #323 from cmurphy/master