Added calibration routine, clean up
Merge pull request #4 from pathim/master

Added calibration routine, clean up