Merge pull request #80 from polynickglot/master

Revert until keyPress fixed