close #22
close #24
Merge branch 'master' of github.com:flxw/bs1