#16 minor adaptions to CPs 537
Merge branch 'master' of https://github.com/oehf/ipf