More flexible fields definition
Merge pull request #2 from samastur/fields_header

More flexible fields definition