grenade fix
Merge branch 'nateBranch' of https://github.com/Xendz/Wulfcore into nateBranch