V2.0- Resolved Github Issues

Resolved #115