Fixed bug in S3 config
Merge branch 'development'