Resolved Github Issue

Resolved #247
Merge pull request #248 from CTDisasterManagement/V5.2

V5.2- Resolved Github Issue