V2.8- Resolved Github Issues

Resolved  #172, #179