BS3 update
Merge pull request #744 from sexnothing/develop

BS3 update