Add an option to envelope marshaled objects
Merge with upstream
Fix broken English
Merge pull request #349 from Ch00k/marshal_with_envelope

Add an option to envelop marshaled objects