Add implementation of a buffer manager
Merge branch 'dev'