Resolve "Better demo detup"

Merged Agate requested to merge 29-broken-demo into develop

Closes #29 (closed)

Merge request reports