Localization

Updating master branch to have working localization