Refactors for shortcut compatibility
Merge pull request #21 from kitan1982/shortcut-fix

Refactors for shortcut compatibility