Merge pull request #27 from johanjusits/branch-1

fixed infested obj bug