V2/localization

Merge for #185