Add language code to the output files
Merge remote-tracking branch 'choose_remote_name/master'