Fix issue 41, 45.
Merge pull request #46 from cliffremote/unhidekeyboard

Fix issue 41, 45.