Merge branch 'gh-pages'
Fixed image sizes
Merge branch 'master' into gh-pages