Resolved Github Issue

Resolved #309