added support for multiple languages
:Merge branch 'master' of github.com:flaviusone/HackathonWebdev