Added better functionality to pair input mode
Merge remote-tracking branch 'origin/master'