fix in penaltyenergy
fix of the fix in PenaltyEnergy
Merge pull request #3 from mlund/master

merge
Merge pull request #54 from gitesei/master

merge w. giulio