(zhs k) bsubs, bsubl
Merge branch 'master' of github.com:ekawa/conf