Merge pull request #114 from Jason-elkins/master