Updated translation-handling

Updated translation-handling
Merge pull request #39 from sonority/translation-handling

Updated translation-handling