fix bug in MX-calibrate
Merge remote branch 'origin/master'
Merge remote-tracking branch 'origin/master'
still related to #154