A faster approach to the same problem.
Merge pull request #4593 from s0undt3ch/develop

A faster approach to the same problem.