Solve #118 by removing reference to Factory.
Merge pull request #132 from Cadair/i118_factory

Solve #118 by removing reference to Factory.