Merge pull request #2 from wangzhaojiang/master

merg
Merge pull request #11 from shui8023/master

Merge pull request #2 from wangzhaojiang/master