b22
Merge pull request #48 from barosl/b22

b22

Reviewed-by: barosl