Resolved Github Issue

Resolved #284
Merge pull request #286 from CTDisasterManagement/V6.5

V6.5- Resolved Github Issue