* fix a bug and adjust code.
Merge branch 'master' of github.com:xirang/chanzhieps