Rewrite intro of block 1
Merging 'master' into 'gh-pages'