01: Better splitting of subchapters
Merge branch 'master' into gh-pages