Improved i18n, see #29