Shortcuts, 2 New buttons, bug fixes
Merge pull request #8 from ymko13/master

Shortcuts, 2 New buttons, bug fixes