scaled using width instead of height
Merge branch 'master' of https://github.com/at-kevinlau/18549