d19
Merge pull request #79 from barosl/d19

d19

Reviewed-by: barosl