Merge pull request #115 from hfmanson/master