first commit. Straith from Mathieu Salanne.