Merge pull request #1 from cnnic/master

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

Merge pull request #1 from cnnic/master