Merge branch 'gh-pages'
Fine tuning the alignment adjustments
Merge branch 'master' into gh-pages