first commit from Geert  : fixed server