Add Andrei Macavei's contrib.