BS update
Merge pull request #743 from sexnothing/develop

BS update