Merge pull request #50 from OpenGeoscience/implement_zoom

Implement zoom
Fixed flicker during zoom in and out