Resolved Github Issues

Resolved #108, #110
Merge pull request #111 from CTDisasterManagement/V1.9

V1.9- Resolved Github Issues