Argh
Cleaned up IterationWriter code.
Merge remote-tracking branch 'origin/master'