Merge pull request #24 from ricsp/hydro-devel

Hydro devel updated with latest changes from master branch