Enhance demo
Merge pull request #1 from cyrille-leclerc/master

Enhance demo