Issue #108: Added all needed CLI params.
Merge pull request #113 from malawski/cli-params

Issue #108: Added all needed CLI params.