Added features to the translate
Merge origin/master