Fix #24 Reviewed-on: #28
Fix #23
Co-authored-by: Clement Desmidt <clement@desmidt.fr> Reviewed-on: #13