Multipart options and fixes
typo
typo
Merge pull request #1121 from spumko/issue/1101

Multipart options and fixes