Merge pull request #9 from grimley517/master

rebasing master
Merge pull request #10 from grimley517/grimley517-issue3

Merge pull request #9 from grimley517/master