Resolved Github Issues

Resolved #235,#236,#238,#239
Testing all the issues with different scenarios.
Merge pull request #242 from CTDisasterManagement/V5.0

V5.0- Resolved Github Issues