d7

Fixes #66
Merge pull request #65 from barosl/d7

d7

Reviewed-by: barosl