public marks

PUBLIC MARKS from jdrsantos with tags editing & apache