Moved getbuffer out of iterator
Merge branch 'getbuffer' into develop