Merge pull request #201 from wade1012/dev

Dev Wade
checkstyle arragement.
Merge remote-tracking branch 'cnnic/dev' into dev