Put in speeling"error" for penalities
Merge remote-tracking branch 'origin/master' into Daniel