-\chapterauthor{Xavier Meyer}{Department of Computer Science, University of Geneva}
-\chapterauthor{Paul Albuquerque}{Institute for Informatics and Telecommunications, hepia, \\ University of Applied Sciences of Western Switzerland - Geneva}
-\chapterauthor{Bastien Chopard}{Department of Computer Science, University of Geneva}
+\chapterauthor{Xavier Meyer and Bastien Chopard}{Department of Computer Science, University of Geneva, Switzerland}
+\chapterauthor{Paul Albuquerque}{Institute for Informatics and Telecommunications, Hepia, \\ University of Applied Sciences of Western Switzerland - Geneva, Switzerland}
+%\chapterauthor{Bastien Chopard}{Department of Computer Science, University of Geneva}