Added support for '+' key
code cleanup.
Merge branch 'fix-keyboard-+'