Changes made by Jeremy Tomasi (jeremy@netkin.fr).