Fixed Demo issue

Fixes #134.