Last polish.
Add a demo.
Add atoum demo on data sampling
Merge branch 'pr/2' into incoming