general commit
Merge branch 'master' of https://github.com/aplabs/bsos
general commit