commented buffer.h
Merged buffer.h from master