Merge demo to master

Since upstream code (cli.py) already has dummy code inside (which I was mistaken to think that it wasn't,) it would be better to take them out after merging these changes.