Merge branch 'jc/parseopt-command-modes'