Improve click capture detection
Merge pull request #111 from emmanuel-keller/master

Improve click capture detection