contrib: Add contribution for Andrei Epure