Added initial camera calibration function
Merge branch 'origin/master'