Resolved Github Issues

Resolved #313
Code review implementation
Merge pull request #330 from CTDisasterManagement/V7.8

V7.8-Resolved Github Issues