Adding tap and double tap support
Merge remote-tracking branch 'origin/master'