bug fixes for localization
Merge pull request #16 from dcs24/master

Localization bug fixes