Merge branch 'master' into gh-pages
using free images
Merge branch 'gh-pages'