Forwarding recursive parts - Issue #18 - Fixes by Oxy1 - Thanks!