Fix zoom bug related to #106
Merge branch 'master' into zoom-bug
Fix to work with only resizing window
Merge pull request #107 from Ephemera/zoom-bug

Fix zoom bug related to #106