Merge branch 'master' of https://github.com/dedal82/calibrations.git