Merge pull request #186 from openETCS/master

cleanup
Merge pull request #187 from openETCS/Hazard-and-Risk

Merge pull request #186 from openETCS/master