tweaks to the concepts
Merge branch 'master' into algorithms-reboot
tweaks to the concepts