patching in nerdyworm's last commit