Corrected error in the branch that test the use of the model without safe division.
Merged models from Annex60 library.
Merge branch 'master' into zeroFlow