DS-66 improve translate
DS-66 clean
Merge pull request #42 from fozeek/DS-66-improveTranslate

Ds 66 improve translate