Merge branch 'dev'
first functional version of bscalibrate
Merge branch 'calibrate' into dev