Adding support for shortcuts
Merge pull request #27 from mjrichmond/master

Adding support for shortcuts (to shortcut-keys branch)