d7

Fixes #67