Resolved Github Issues

Resolved #114, #118, #119, #120
Merge pull request #121 from CTDisasterManagement/V2.1

Resolved Github Issues