merge to integrate last commits
fix coquille messages