Merge pull request #48 from dalexj/alex

refactored many basic objects
Merge pull request #49 from dalexj/alex

Alex
Merge pull request #50 from dalexj/alex

fixed all BI tests