public marks

PUBLIC MARKS from asteroza with tags change & opensource