Added zoom options (hold to zoom or toggle zoom)
Merge remote-tracking branch 'origin/master'