Add support for CLI params.
Fix regression in tests.
Address review comments.
Merge pull request #35 from Gozala/bug/cli-params

Add support for CLI params.