V1.7- Resolved Github Issues

Resolved #22, #87