finish measuring-value
add measuring value
merge master
Finish Measuring Value
fix merges