[bug 1087395] Add fields to CSV output
Merge pull request #420 from aokoye/1087395_csv

[bug 1087395] Add fields to CSV output