Resolved Github Issue

Resolved #243
Merge pull request #246 from CTDisasterManagement/V5.1

V5.1- Resolved Github Issue