Separates infection from graph objects.
Merge pull request #6 from akellehe/infection-rc1

Separates infection from graph objects.