Close #95
Merge branch 'i18n' into development