Merge pull request #1 from ypwalter/fix_keyboard

Merged.
Refactoring.