bug fix 2
Merge branch 'v1.x' of https://github.com/PengCX/GitTest into v1.x