Resolved Github Issue

Resolved #304, #307, #310