just a small if simplification
Adding a linkable heading; will get the others in a sec.
More direct linkable headings.
Merge branch 'master' into gh-pages