b1
Merge batched pull request #24 from barosl/b1

b1

Reviewed-by: barosl