[FIX] fixed bs_tools
Merge pull request #588 from weese/feature/stream-fixes

[FIX] fixed bs_tools