Finishing up localization
Merge localization into master