V2.2- Resolved Github Issue

Resolved #120