Added --dry-run and --output-folder options