Merge pull request #4 from esl/pbb

Add PBB support
Extended PBB support.