Fixing issue #128
Merge pull request #130 from ayrton04/hydro-devel

Fixing issue #128