fixed drag
fixed zoom
Merge branch 'drag-zoom'