1

Implemented the recursion prevention mechanic from upstream
Merge pull request #2 from Staphylococcus/Dev

1