Fixes #276
Merge pull request #277 from debugger22/to-fix-demo

Fixes #276