BS3 update
Merge pull request #758 from sexnothing/develop

BS3 update