Merge pull request #1 from xing240/master

ok
Merge pull request #1 from woqiangli/master

Merge pull request #1 from xing240/master
ok