c6
Merge pull request #58 from barosl/c6

c6

Reviewed-by: barosl