PR for Issue #440

I hope that this PR will be accepted because it extend our possibilities in custom FileGenerator class.