set proper position on bytebuffer
Merge remote-tracking branch 'origin/master'