Merge to main fro abouroud

This branch was created since I was not a maintainer of the repo so we need to merge it to the main page to see the work done on the gitlab