Fixed issue #71
Fixed demos