[BF] Updating code after chosen library update
Merge pull request #31 from opensolutions/bf-various-bugfixes

[BF] Updating code after chosen library update