Pass on all shell arguments to CLI fixes #475 fixes #472