Feature argparse

Fixing issue #5 and #6