complete translate
fix bug
Merge branch 'pr/18'

Closes GH-18