Add ability to suppress fields in the output
Merge branch 'optional_fields'