Merge pull request #5 from Vexatos/master-fork

Localization fixes