merge with dcputeam

Keyboard Fixes for Issue 215