Shortcuts

Implement shortcuts mentioned in #55