Merge pull request #51 from ipa-fxm/hydro_dev

Hydro Updates