modify some bug
Merge branch 'master' of github.com:VectorWinner/haochigo