Fix issue #150: I18n clean-ups
Merge pull request #151 from krzyc/i18n-cleanup

Fix issue #150: I18n clean-ups