public marks

PUBLIC MARKS from naudjf with tags server & wap