Merge pull request #109 from CTDisasterManagement/V1.8

V1.8- Resolved Github Issues
no message
Resolved Github Issues

Resolved #108, #110