Merge pull request #26 from ricsp/hydro-devel

Fix compiling in travis for hydro-devel