public marks

PUBLIC MARKS from ckaroli with tags mac & tag-based