Maintain original header/field order.
Merge pull request #3 from robguttman/master

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