Restore command line capability lost in 26f981 and improve by using argparse