d18
d19
Merge pull request #79 from barosl/d19

d19

Reviewed-by: barosl
Merge pull request #78 from barosl/d18

d18

Reviewed-by: barosl