closes #94 generators support