more multilingual, plus fixes #112 (with test)
Merge pull request #114 from LegoStormtroopr/multilingual

more multilingual, plus fixes #112 (with test)