Step 3 : energy
Merge pull request #4 from fabriceambert/step3

Step 3 : energy