V4.3- Resolved Github Issue

Resolved #200, #207