History now loads and calibrates correctly
Scale the y-axis on zoom
Merge branch 'output' into development