Issue#67

Resolves issue #67