demo edit

merge demo_branch to master