Improve command line options
Merge pull request #4 from petems/improve_opts

Improve command line options