V1.7- Resolved Github Issues

Resolved #22, #87
Merge pull request #101 from CTDisasterManagement/V1.7

V1.7- Resolved Github Issues