✨ TWEAK: merge pull request from wareneutron/dev minor project maintenance