Added factories
Merge pull request #5 from fender707/feature

Added factories