Resolved Github Issue

Resolved #281, #283
Testing with different scenarios
Merge pull request #285 from CTDisasterManagement/V6.4

V6.4- Resolved Github Issue