Merge pull request #581 from jktjkt/hysteresis