Replaced demos with demo handles, fixes #10