Issue/#67

fixes #67