Merge pull request #35 from YoheiKakiuchi/hydro-devel

Hydro devel