Improve command line arguments and output
Improve command line options and output
Merge branch 'release/0.0.1'