Merge pull request #474 from Fox-McCloud/master

Merge Conflict
Merge pull request #33 from ZomgPonies/master

Merge From Master