Merge pull request #322 from cmurphy/master