Interactive demo, fix issue #172