merge hydro
Merge pull request #7 from ipa-nhg/merge_hydro_dev

Merge hydro