Merge pull request #20 from lanice/enable_zooming

Enable zooming
Merge remote-tracking branch 'origin/master' into hand_of_god