Merge branch 'master' into gh-pages
tweaks
optimize images
Merge branch 'gh-pages'