Merge pull request #3 from Mitch650/master

merge