Issue #228: Command line switches