Issue11

Fixed issue #11. Control-key combinations should work now.

The commits should probably be `cherry-pick`ed into `master`.

Introduces some weird behavior, but that was unavoidable. See comment on diff.