Yea, calibration
Fixed conflict
Merge pull request #4 from antoniovassell/antoniofeature

Yea, calibration