account for zoom in pan limiting #15
Merge branch 'master' into pointergestures
no hammer