Keep the aspect ratio of the image
Merge branch 'master' into gh-pages