Added cmd line tool for ease of use.
Minor param change.