[Fix #225] fix PropCostRegular wrt to S. Demassey instructions.
Merge branch 'iss_225' into develop