midweek merge

Joni Krebsrequested to merge
joniDev into master
  • algorithm updates
  • changed terminology expansion

Merge request reports