Fixed EffectFactory
Merge branch 'FixEffectFactory' into develop0.2