Merge pull request #3 from fender707/feature

Feature
fixed syntax error
Merge pull request #4 from fender707/factories

fixed syntax error
Added factories