Merge pull request #2 from johan-jonsson-mobenga/master

Made the multitouch a bit better