initial effective calculation - Q3120, Q3130, Q3310, Q3320, Q3330
Merge remote-tracking branch 'origin/master'