Fix/co2tables

Merged Timo Koch requested to merge fix/co2tables into master

Merge request reports