Improve around initial config file generation
Language updated
Merge branch 'develop'