allow both config and cli options.
Merge pull request #31 from jdeblank/development

allow both config and cli options.