controls
Merge pull request #12 from watabou/master

More shortcuts