fix ob 2
Merge pull request #65 from Assada/feature/ob

fix ob 2
Merge pull request #66 from Assada/feature/structure

Feature/structure