Merge pull request #142 from Itsyuka/master

Full Localization blame Yuka for any problems.
Hmm

The weird thing is that I missed that because it wasn't actually in my
build... Somehow my local files got reverted so the fuck happened here?
Merge pull request #1 from TAWTonic/master

Pulling stuff