Added Keyboard Shortcuts support + mac test