* FIX: Deep recursion
Merge branch 'master' into debug