Add i18n support
Merge local and remote branch