tweaks to the concepts
Merge branch 'master' into algorithms-reboot
tweaks to the concepts
Merge remote-tracking branch 'upstream/algorithms-reboot' into algorithms-reboot