improved fields, methods for getting header for different format
Merge remote-tracking branch 'origin/master'