Correction of the way WM is calculated
push version
Merge branch 'master2'