Scaled the picture size to the right fit
Merge branch 'master' into pictureSize