updated s3 to public-read
merge master