Adding command line overrides
Merge pull request #10 from rspieldenner/overrides

Adding command line overrides