Improve click capture detection
Merge pull request #110 from emmanuel-keller/1.5

Improve click capture detection