Added buffer-size option