Fixes #1 (keyboard shortcut feature)