public marks

PUBLIC MARKS from asteroza with tags location & 2.0