Add keyboard shortcut
Merge branch 'develop'