cleaned up factories and versioned api
yup
Merge pull request #12 from orodio/factory

Factory