Merge pull request #101 from Jason-elkins/master