Merge pull request #164 from ryanttb/b2

fix pinch zooming again