public marks

PUBLIC MARKS from asteroza with tags gui & 7.0.4