Sophisticate the command-line interface remarkably
Update __doc__