Localization + Minor Bugfixes
Merge pull request #300 from Fuzzysqurl/master

Localization + Minor Bugfixes