Some fixes regarding the pull request
Merge pull request #3 from mdevlamynck/keyboard

Some fixes regarding the pull request