Merge pull request #49 from ipa-nhg/hydro_dev

merge cob4