Addded ability to select the language from the application
Merge branch 'kostas'