Merge pull request #22 from Astro03/master

Fixed KeyEvent method. Fixed #21