Merge pull request #1 from InfectedZombie7/master

Updates