Revisied model_validation
Merge branch 'model_validation' into develop