adding support for CLI parameters
Merge branch 'eclifford-adding_cli_parameter_support'