c1
c2
Merge pull request #53 from barosl/c1

c1

Reviewed-by: barosl
Merge pull request #54 from barosl/c2

c2

Reviewed-by: barosl