V4.0 - Resolved Github Issue

Resolved #57