public marks

PUBLIC MARKS from julien.c with tags montreal & patch