Add directories to shortcut
Merge branch 'master' into mac