pinch bugfix
Merge pull request #14 from jmdetloff/john/pinch_zoom

 pinch bugfix