expanding buffer to use 1 full pixel
Merge remote-tracking branch 'origin/master'