Updated Localization
Merge Master