Fixed multi-touch handling
Merge pull request #1147 from bassarisse/develop

Fixed multi-touch handling