Resolved Github Issue

Resolved #311