Merge pull request #97 from windyarts/master

Fix keyboard issue