Merge branch '88-better-define-the-calculation-limits' into 'main'

Resolve "Better define the calculation limits"

Closes #88

See merge request !105