apply review
Merge pull request #74 from EngForDev/translation

#20 apply @jksy s review