Recursion with different relations solved
Clean code
Merge branch 'master' into jaume