Merge pull request #21 from firecat53/master

Migrated to argparse instead of optparse