Merge pull request #116 from wade1012/dev

Dev
Merge pull request #18 from cnnic/dev

Merge pull request #116 from wade1012/dev