This commit fixes some conflicts created by my current version.
This commit fixes the potential memory leak in the ObjectFactory class and adds new tests for the memory leaks.
Merge pull request #26 from ruribe/master

Fixing potential memory leaks.