Merge FernetMenta master branch