merging master changes into tect_stress_calcs