Add bson file as input/output stream
Merge branch 'patch-2'