Add zooming in and out
Merge remote-tracking branch 'origin/master' into nico
Remove console.log statement