Merge pull request #1 from wzhen22/master

1.16 wz
1.16wz
1,17 zhouqin morning
Merge pull request #26 from zhouqin0414/master

1.17 zhouqin morning