Merge pull request #1 from peerster/master

Added argparse for better control of arguments