#150: Created Factory
closes #150