Added keyboard shortcut support