Resolved Github Issue

Resolved #233, #274