bug fixes
Merge branch 'master' of https://github.com/azgs/hazards-viewer