working calibration
Merge branch 'dev'