small cleanup
working m$ keyboard scanner
Merge remote-tracking branch 'upstream/master'