merge w. giulio (master)

Did you add the penalty.png to the doc/images dir?