Restore load/gradient after done with calibration
Merge pull request #473 from jjofre/master

Restore load/gradient after done with calibration