@ranine @mszopos a first implementation of #213