Merge pull request #114 from pschiffe/master

system: added new info
system: added language info
Merge remote-tracking branch 'upstream/master'