Fixes touch events
Merge pull request #352 from mrcdk/fix_touch

Fixes touch events