Updated after fork from Bozhidar Batsov's prelude directory