Merge pull request #36 from ZomgPonies/master

Merge Update
Merge pull request #478 from Fox-McCloud/master

Merge pull request #36 from ZomgPonies/master