pure i18n compatibility + some refactoring
Merge pull request #11 from Bonias/pure-i18n-compatibility

pure i18n compatibility + some refactoring