Resolved Github Issues

Resolved #307, #324
Merge pull request #335 from CTDisasterManagement/V7.9

Resolved Github Issues