Merge pull request #247 from
flower-platform/GH239-improve-shortcuts-mechanism

#239 improve shortcuts mechanism
Merge remote-tracking branch 'origin/master'