fixed broken NullWriter and some docblocks
Merge remote-tracking branch 'origin/master'