Merge pull request #12 from ricsp/hydro-devel

Merge branch master into hydro-devel