CFP/edit : Mathieu's PR rebased

This is @mpetitdant's mix-it/linkit#115, only rebased.