Added system vs user cpu
Merge branch 'master' into javier