Merge pull request #2 from ipa-fxm/hydro_dev

sync'ing branches
Merge pull request #3 from ipa-fxm/hydro_syncmm

Merge pull request #2 from ipa-fxm/hydro_dev