Allow CLI options in config
Updated documentation about CLI options
Merge branch 'cli-options-cfg'