Merge pull request #316 from cmurphy/master