Merge pull request #2 from DarkSamurai/master

Merge pull request #1 from DarkSamurai/develop
Merge pull request #3 from DarkSamurai/develop

Merge pull request #2 from DarkSamurai/master