Merge pull request #37 from ipa-nhg/hydro_dev

Hydro dev