Localization changes

Fix for #254.