Merge pull request #29 from jdef/demo

get demo building again