Merge pull request #1 from tombatossals/master

merge