New: Added CPU type, count cpu cores
Merge remote-tracking branch 'origin/master'