Factory adjustments
Factory code fix
Merge pull request #2 from BrBigelow/develop

Develop