Update setup to bs3
Update setup to bs3
Merge pull request #770 from voltan/develop

Update setup to bs3