V2.8- Resolved Github Issues

Resolved  #172, #179
Merge pull request #186 from CTDisasterManagement/V2.8

V2.8- Resolved Github Issues