improved zooming
Merge branch 'master' of https://github.com/MMazzocchi/kiwi
more zoom changes
Merge branch 'master' of https://github.com/MMazzocchi/kiwi