Python 3.3 friendly
Calibration updated