change the weight to DiagCounter
Merge remote-tracking branch 'origin/master'
fix a bug in InitialWithDiagCounter, still a bug in MC(Order1 and Order4)
Merge branch 'master' into dev
merge