Merge branch 'master' into Adar
side by side: calculations
Merge branch 'Adar'