Initial commit of patch for JSON and CSV output