Added support for buffer options. Required for satellite-tracker