#20 Fixed multi-language support
Some code cleanup
Merge branch 'master' into web-services