Update demo scripts
Merge pull request #201 from brenoc/demo-scripts

Update demo scripts with the new wrappers