Last-minute patches
Merge branch 'master' of github.com:flxw/bs1