Merge pull request #85 from azakus/master

Fix broken touch handlers