Feature/en 1831

Nit pick: grammar, useHeaders is more correct than using Headers.