public marks

PUBLIC MARKS from jdrsantos with tags recovery & open_source