Merge pull request #182 from cmurphy/master