Improved InputHandler, Fixes #64