added more shortcuts
Merge branch 'master' into searchengine