Merge pull request #7 from ipa-fxm/hydro_dev

Cleaning up deps
Merge pull request #9 from ipa-fxm/hydro_dev

Hydro Updates