Merge pull request #3 from mattwalker62/master

merge2