Pulling in code from pull #28 on json2csv