Merge pull request #2 from cnnic/dev

Merge pull request #82 from wade1012/dev