Merge pull request #1 from cnnic/dev

Dev add 5 30
Merge pull request #82 from wade1012/dev

Merge pull request #1 from cnnic/dev