Resolved GitHub Issues

Resolved #158, #331, #336
Merge pull request #338 from CTDisasterManagement/V8.1

Resolved GitHub Issues