Revert "Revert "Credit to porglezomp added""

This reverts commit 158270bffa002cf9ee67da33f9660613590c01da.