corr
merge
many improvements
shorter
fix test
fix test
Merge pull request #37 from ProjetPP/clever_merging

Clever merging