Issue 67

solve #67