Resolved Github Issue

Resolved #352, #353, #354, #356