Fixes #355
Merge pull request #366 from sumobi/languages-update

Fixes #365
Fix #369
Merge pull request #370 from sumobi/issue/369

Fix #369