Improved getShortcut() return
Merge pull request #5 from wmbenedetto/develop

Improved getShortcut() return