Calibrating issues **UPDATE**

Check out #5: