V1.8- Resolved Github Issues

Resolved #87, #104