Fix several touch issues
Merge pull request #86 from WebsiteDeveloper/master

Fixed several touch issues