system: added language info
Merge remote-tracking branch 'upstream/master'
Merge pull request #115 from pschiffe/master

system: added language info