Fix to CameraCalibrator calls and retrieval of camera geometry

This merge request fixes #2 (closed), #3 (closed). See corresponding issues for more information.