Merge pull request #2 from ipa-fxm/hydro_dev

sync'ing branches