Merging changes from hydro-devel (issue #20)