From LT3, Anaïs
Merge branch 'master' of https://github.com/teamdiamond/measurement