Add cpu plugin
Style fixes
Merge pull request #128 from jpoittevin/style-fix

Style fixes
Merge pull request #127 from jpoittevin/cpu-plugin

Add cpu plugin