Merge branch 'master' of https://github.com/cleochan/b2b.git