Gérard Milmeister

I just pulled the latest master. It seems to be working now, but I have to check.