Merge pull request #185 from cmurphy/master