Merge pull request #14 from evmarkov/master

Calibration class redesign to support BeadTypes