Fixed NO/NO2 issue

Still needs calibration
Fixed number of outputs
Merge branch 'master' of https://github.com/jemofthewest/DOECPF