Keypad Tracker
optimization
Merge pull request #8 from DaaOtt/master

keypad tracker