b4
Merge batched pull request #30 from barosl/b4

b4

Reviewed-by: barosl