merged master'
Added in features for JSON, XML, and CSV