bs3 updates
Merge pull request #1035 from stevewithington/develop

bs3 updates