hallu
b2 commit"
Fixed merge conflict
Merge pull request #2 from buren/b2

B2