improve penalty system, add a test and fix #2464#2498

Merged

forki merged 1 commit intomasterfrom fix_2464

Jul 10, 2017

+34-16

Commits on Jul 9, 2017

remove some magic numbers from the penalty system, add a test and fix #2464
matthid
committed