Merge pull request #476 from Fox-McCloud/master

Merge Conflict Resolution?
Merge pull request #36 from ZomgPonies/master

Merge Update