BS3 update
Merge pull request #759 from sexnothing/develop

BS3 update