fixed image aspect ratio
Merge branch 'master' into kevin