Merge pull request #1419 from alex/cleanup-fernet

Move the supported marks to class level for fernet