fix demo, localize some deps
Merge remote-tracking branch 'github/master'