working version
Merge branch 'master' of https://github.com/annaku/amazon-s3-upload