wrap in p, close img
Merge branch 'master' into gh-pages