Big merege with Tristan's 3:30 may14 commit
Some stuff don't work...   :(