bug fix
update demopage
merge