Merge pull request #285 from CTDisasterManagement/V6.4

V6.4- Resolved Github Issue
Resolved Github Issue

Resolved #284