Merge FernetMenta branch