Add S3 Support, changing the API a bit.

Space missing to the left of {.