解决一堆乱七八糟的bug
Merge branch 'master' of github.com:zzjove/PinPeng