From Alice
Merge branch 'master' of https://github.com/teamdiamond/measurement