Merge pull request #3 from mattwalker62/master

merge2
Merge pull request #5 from mattwalker62/bugfix

Merge pull request #3 from mattwalker62/master