added cmdline aliases
Merge branch 'master' into distributed
wip