fix git pull issue
Merge branch 'master' into support-multiple-measurements