Copied add-ons from rob-nhlib to rob-hazardlib