Add demo. Clean up
Merge pull request #37 from thejsj/master

Add demo. Clean up