V1.9- Resolved Github Issues

Resolved #108, #110