ADD: HOTKEY
Merge branch 'master'