Merge pull request #3 from cnnic/master

fetch from cnnic
Merge pull request #101 from yun51/master

Merge pull request #3 from cnnic/master