s3 fixes for Gluttonberg TV
Merge pull request #101 from abdulrauf/3.0

s3 fixes for Gluttonberg TV