Switching from rudimentary argument parsing to argparse.
Merge remote-tracking branch 'origin/master'