Merge with streams_evol_feb
Merge branch 'master' into merge_test
Correction of warning because of space before parentheses
correction of function warning
merging Manu work