Some more tweaks to web site (and I will stop now)
Merge remote-tracking branch 'origin/master'