R18n added
r18n fixes
Merge pull request #46 from viktors/feature/r18n

Feature/r18n