Resolved Github Issue

Resolved #303, #306