Expand lib and build from BaB changes
Merge pull request #2 from slickmb/task/expandFromBaB

Expand lib and build from BaB changes