Fixes #24 - Shortcuts now works