更新至6.9小节
Merge branch 'master' into gh-pages