Merge pull request #3 from yzf/master

merge
Merge pull request #6 from yzf/master

adf
Merge pull request #7 from yzf/Huo

Huo