The library was updated wth BS

This is a merge commit into submit_hw from master