After pleroy's review
Fix build
Merge plot-trajectories after pleroy's review.