fix some bug
Merge branch 'master' of https://github.com/Newcomer520/demo
fix some bugs.