Added template for issue #1;
Slight naming fix in demo;