Restored missing code.
Merge pull request #94 from hawesie/hydro-devel

Restored missing code.