Fix #6 and improves map zooming