initial effective calculation - Q3640
Merge remote-tracking branch 'origin/master'