Fixes #15 - Generators support