Issue #9 Improve translation