Fix for #5
Fix for #160
Merge pull request #165 from DLu/hydro

Two More Bug Fixes