Fixed zoom scale for images
Merge branch 'master' into test_branch