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

Fixes #365