Update API for new BS
Merge branch 'develop'
1.0.0