Merge pull request #1 from cnnic/master

menglunyang first updata