Merge branch 'master' of github.com:westie314/swb2