Merge pull request #363 from CTDisasterManagement/V9.0

V9.0 - Resolved Github Issue
Resolved Github Issue

Resolved #351