修改client bug
Merge branch 'master' of https://github.com/melin/super-diamond