public marks

PUBLIC MARKS from simon_bricolo with tags template & osx