Merge pull request #199 from gm4tr1x/fillBuffer