The Infection Begins

wah wah waaaaaaaa!
Merge pull request #18 from hilburn/1.7-update

The Infection Begins