Addresses issue #2 - maintains original header/field order.

Includes one new test.