Merge pull request #1 from gerhard/master

Sync up
S3 strategy
Tweaks and docs
Merge pull request #1 from TheDeveloper/s3-strategy

S3 strategy