Merge pull request #11 from evmarkov/master

Calibration class redesind and library build fix