Merge pull request #83 from kbogert/hydro-devel

Implement automatic calibration system