Fixes #10: updated translator and added unit tests