Issue #228: Command line switches
Merge pull request #234 from corporateshark/commandline

Issue #228: Command line switches