contrib: Add contribution from Alexandru Gheorghiu