Demo ready
Merge pull request #1 from mdrewt/demo

Demo ready