Add multi-language support (includes English, French, and German)
Merge remote-tracking branch 'origin/master'