Develop new sampling algorithm
Merge branch 'develop' of https://github.com/mcolmant/powerapi into develop