push argparse branch
push argparse branch
code reorg
Update readme before merge