Bbm

Merging the bbm branch into the master branch