V3.6- Resolved Github Issue

Resolved #46