Merge pull request #125 from morpheyesh/0.6

byoc aws s3 fix

Merge pull request #113 from megamsys/master

Merge pull request #92 from thomasalrin/master