b2
Merge batched pull request #25 from barosl/b2

b2

Reviewed-by: barosl