localization-support
Merge pull request #5 from lowstz/localization-support

localization-support