Merge pull request #60 from cdondrup/hydro-devel

Tested a couple of times. Works fine.
Merge branch 'hydro-devel' of https://github.com/cdondrup/strands_hri into hydro-devel
Merge branch 'hydro-devel' of https://github.com/cdondrup/strands_hri into hydro-devel
Forgot a 'self'