Merge pull request #226 from cmurphy/master