public marks

PUBLIC MARKS from dszalkowski with tags pare-feu & pgp