public marks

PUBLIC MARKS from alexf10 with tags security & maps