Issue 67

Resolved #67