Merge pull request #610 from joshualy/hysteresis

Hysteresis and Heat Flow