* fix from bug.
Merge branch 'master' of github.com:xirang/chanzhieps