Merge pull request #17 from moriony/master

add system info fields and other missing fields