Just changed some things...
Merge pull request #1 from DeathWinged/master

Just changed some things...