Merge pull request #1 from ipr-sr2/hydro_migration

Hydro migration
Merge branch 'master' of github.com:ipr-sr2/setup into hydro_migration