Merge pull request #1 from AnimusWhite/master

Merge