Buffering added for the output generators
Merge remote-tracking branch 'origin/master'