fixed bug
Merge remote-tracking branch 'tom/tom_demo' into demo