update some bug
Merge branch 'master' of https://github.com/jerrytan/zcw