First Update

Final v1.1, working on v1.2 and adding calibration tool