Added support for s3cmd