add (optional) makespan in cumulative
Merge branch 'feature-makespan' into develop