Adding i18n support - Fixes #2