public marks

PUBLIC MARKS from nhoizey with tags windows & bug