update docs
Merge remote-tracking branch 'cnnic/dev'
Merge pull request #354 from forumbyr/master

update docs