fixed bug on master
some change
updated demo2