Bug fixes in buffer manager
Merge pull request #15 from medo/buffer_manager

Bug fixes in buffer manager