Updates from work
Merge branch 'version2' of https://github.com/MinorTechnologiesLLC/emergencysafeguard into version2