b6
Merge batched pull request #32 from barosl/b6

b6

Reviewed-by: barosl