Use argparse; resolves #1, #2