Updated localization
Merge Master