Fix guests section when guest's name is short
Fix typos
Merge remote-tracking branch 'origin/master' into gh-pages