Link to doc.
Small optimization.
Cleanups.
Merge branch 'master' into gh-pages