added images and with borders
Merge branch 'master' into gh-pages