merge cob4
Merge pull request #84 from ipa-nhg/hydro_dev

merge cob4