Added lang option
Merge branch 'develop'