Merge branch 'refactor-settings'
Merge branch 'refactor-settings'
Update social preview image
Merge branch 'master' into gh-pages