Added toggling for both debug modes
Merge branch 'master' of https://github.com/kshen0/gestures