Finish for demo
Merge pull request #16 from Cfeusier/CF_demo_branch

Finish for demo