Merge pull request #214 from CTDisasterManagement/V3.9

V3.9- Resolved Github Issue
Resolved Github Issue

Resolved 207