Resolved Github Issue

Resolved #351