Completed the Keypad
Merge remote-tracking branch 'origin/master' into Mandip