fixed images to not be stretched and such
Merge remote-tracking branch 'origin/master'
merged