bugfix: Calibration constructor: h and d parameters were switched
Merge remote-tracking branch 'origin/master'