Fix touch support
Merge pull request #99 from ninjadev/test-touch

Fix touch support