maj trace

Signed-off-by: exocen <exo@localhost.localdomain>
Merge branch 'master' of https://github.com/aeagithub/TP-aea