Merge pull request #1 from cnnic/master

fetch from cnnic