public marks

PUBLIC MARKS from asteroza with tags jabber & framework