Adding support for shortcuts (to shortcut-keys branch)

Let me know if this isn't the branch you were talking about.