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

Refactors for compatibility with shortcut