minor editions due to AgMIP contribution
Merge branch 'master' of https://github.com/zalf-lsa/monica