Merge branch 'Measure' into master