Merge pull request #28 from ipa-mig/hydro_dev

small adaptations for next release