fix demo build
Merge branch 'master' into fixDemo
Merge pull request #6 from UprootLabs/fixDemo

Fix demo build