Review Gabija

I merged the MR !117 (merged) linked to issue #306 (closed) too fast, needs review