Merge pull request #9 from cossatot/master

merging master changes into tect_stress_calcs