Merge pull request #1 from Trixarian/master

merge