d18
Merge pull request #78 from barosl/d18

d18

Reviewed-by: barosl