Adds json and ods export for #53.
Merges with branch master