Translator refactoring, fix translator tests
Merge pull request #4 from JOLO-/master

Translator refactoring, fix translator tests