#20 Fixed multi-language support