Merge pull request #31 from ARGOeu/devel

Sprint 25
Merge pull request #37 from ARGOeu/devel

Sprint 26 release
Merge pull request #40 from ARGOeu/devel

Merge devel to master
Removal of deprecated call in calculate.sh
Merge pull request #43 from pkoro/hlp

Removal of deprecated call in calculate.sh