Merge branch 'master' into gh-pages
Fix img src
Merge branch 'gh-pages'