Merge pull request #1 from cnnic/develop

Develop
Merge pull request #60 from wade1012/develop

Merge pull request #1 from cnnic/develop 2