Merge pull request #125 from hfmanson/master