added in click detection
Merge branch 'master' into clickDetectin