minorchanges to calibrate
Merge branch 'master' of github.com:drphilmarshall/Pangloss