Fixing cpu usage calculation
Merge branch 'origin/master'