public marks

PUBLIC MARKS from nhoizey with tags support & hack