b7
Merge batched pull request #33 from barosl/b7

b7

Reviewed-by: barosl