Fixed factories
Released v0.2.1