Merge pull request #105 from Jason-elkins/patch-4