Merge branch 'master' into gh-pages
social media adjustments
Merge branch 'gh-pages'