Merge pull request #1 from woqiangli/master

Merge pull request #1 from xing240/master
ok
Merge pull request #2 from woqiangli/master

Update test
222
Update test
12
Merge pull request #4 from woqiangli/xing240-master

Xing240 master