Merge pull request #31 from ZomgPonies/master

Merge From Master
Merge pull request #32 from ZomgPonies/master

Merge From Master
Merge pull request #474 from Fox-McCloud/master

Merge Conflict