Fixed cpu to cpuinfo
Merge branch 'master' into testing
Merge pull request #1 from antonichuk/testing

Testing