Merge pull request #1 from Tes7/master

awesome!
Merge pull request #2 from Tes7/ninja

Merge pull request #1 from Tes7/master