Changed bbi-file ctor to take std::istream.
merge commit