Improve key bindings
Merge pull request #7 from ivo-/key-bindings

Improved key bindings