Merge pull request #114 from Taapat/translation