V3.7- Resolved Github Issues

Resolved #200, #204
Merge pull request #208 from CTDisasterManagement/V3.7

V3.7- Resolved Github Issues