Merge pull request #44 from ZomgPonies/master

Merge from Master
Fixes and Stuff
Merge pull request #492 from Fox-McCloud/Little-Fixes

Little fixes
Merge remote-tracking branch 'upstream/master'