Better way of specifying initial buffer size.
Merge remote-tracking branch 'origin/master'