Issue/#67

Fixes #67