Working on adding support for optional buffer auto-close...