Fixed some translation bugs in #166
Merge branch 'feature/166' into develop