Merge pull request #21 from cnnic/dev

Dev
checkstyle
Merge remote-tracking branch 'remoteGit/dev' into dev
Merge pull request #150 from wade1012/dev

Dev Wade