Add option to include raw buffers to returned object
Reformat options documentation