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