Merge pull request #12 from evmarkov/master

More params and error handling for CalibrationInfo