Fix win build (Win-vs2013)
Update Measurements (Win-vs2013)