Merge pull request #1 from unikent/master

[DeployBot] STABLE Pull
Merge pull request #3 from unikent/master

Merge master into STABLE
Add missing lang
Merge pull request #4 from unikent/feature/lang

Feature/lang