public marks

PUBLIC MARKS from mfaure with tags git & meld