Merge pull request #17 from camillobruni/2024-11-26_safe_add

Use simpler safe_add