Close #43

Multiple i18n fixes
Merge branch 'i18n' into development