Another contrib of spopescu.