Fixed potential buffer pointer breakage
Merge pull request #70 from LinuxJedi/buffer_pointers

Fixed potential buffer pointer breakage