Merge pull request #3 from cnnic/master

fetch from cnnic