Merge pull request #1 from Gaddict/master

merge