Merge PR #207, zooming hotkeys