Fixed a bug: the position of calcStress()
Merge remote-tracking branch 'origin/master'