Add bson & mongo
Merge pull request #1267 from msimon/master

Add bson & mongo