Merge pull request #9 from grimley517/master

rebasing master closed #3

branch to close.