Update parsing args, fixes #9