Issue#67

Resolves #67 
Closes #67