V3.2- Resolved Github Issues

Resolved #187