fixed an issue with multipart uploads, simplified file retrieval
Merge remote-tracking branch 'origin/master'