Bug fixes
Merge pull request #1 from ogail/zoom

Bug fixes