Merge pull request #118 from Dima73/translation