Simpler chapter names
Merging 'master' into 'gh-pages'