Merge branch 'master' into gh-pages
Correct images urls
Merge branch 'gh-pages'