d7

Fixes #66
d9
Merge pull request #69 from barosl/d9

d9

Reviewed-by: barosl
Merge pull request #65 from barosl/d7

d7

Reviewed-by: barosl