Extra command line option
Appears to work fine
Merge branch 'master' into slice